Resolve CVS conflicts

diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index f3bc0bcaa68e2a0e9678e7a840fd94006cd493f5..43177b7c99b1c7b450ddf511ae94e176ba4d0a70 100644 (file)
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -632,4 +632,5 @@ automatically, no user input is required."
 
 (provide 'rmail-spam-filter)
 
+;;; arch-tag: 03e1d45d-b72f-4dd7-8f04-e7fd78249746
 ;;; rmail-spam-fitler ends here